]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
network: Make sortByName to properly handle null values
authorMarco Trevisan (Treviño) <mail@3v1n0.net>
Wed, 9 Jul 2025 03:56:27 +0000 (05:56 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 1 Aug 2025 14:29:12 +0000 (16:29 +0200)
g_utf8_collate is not nullable, but is used in a relevant piece of code,
so better not to throw any error if a null value is compared

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3785>
(cherry picked from commit 674cfd49f297dd438e5fcefc8ad2dbedeeda2af0)

js/ui/status/network.js

index 25247f7deaff42e6f88054f4104e44c2f39c2929..7e06775d7b3725de6525eb52600cdbfa4b823fb7 100644 (file)
@@ -116,7 +116,7 @@ class ItemSorter {
     }
 
     _sortByName(one, two) {
-        return GLib.utf8_collate(one.name, two.name);
+        return GLib.utf8_collate(one.name ?? '', two.name ?? '');
     }
 
     _sortByMru(one, two) {